From 43d4cb789b280565dfe85cc03d6a0266b45592c3 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 29 Jan 2020 15:25:26 +0000 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 465130 -> 465418 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 63d7c10ffd8..b5f03db9159 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -296,6 +296,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index 917d6d4f49091fb4e4a0cdc225ee38f8148455eb..7a858892c8628a99a21828759152b3d3f3ebb331 100644 GIT binary patch delta 216 zcmaF0QKoB)OhXG}3)2?nLqDenvN4HF52#=iGEnhy40H7K3vmq!2yz9I3YoGLMUs6J%1nhhuPj zlxvWGe3-9o<@ChcEaKB2h_Ome=b6VQGTq@C3;*AjCKQ<1gmo>8k&kW7=>3W(HywAZFcu`!}1u F8~}5p7{~ws diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2